Skip to content

Conversation

RalfJung
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

marmeladema and others added 18 commits May 21, 2020 17:07
Probably missed it out during earlier `dyn` refactoring.
…, r=ecstatic-morse

Remove all uses of `NodeId` in `ResolverOutputs`

cc rust-lang#50928

r? @ecstatic-morse
…ark-Simulacrum

bootstrap: propagate test-args to miri and clippy test suites

For Miri I verified this works. For clippy, unfortunately it doesn't seem to work as a stage 0 tool:
```
./x.py --stage 0 test src/tools/clippy --test-args init
```
gives
```
   Compiling clippy-mini-macro-test v0.2.0 (/home/r/src/rust/rustc.3/src/tools/clippy/mini-macro)
error[E0658]: procedural macros cannot be expanded to expressions
  --> src/tools/clippy/mini-macro/src/lib.rs:11:5
   |
11 | /     quote!(
12 | |         #[allow(unused)]
13 | |         fn needless_take_by_value(s: String) {
14 | |             println!("{}", s.len());
...  |
24 | |         }
25 | |     )
   | |_____^
   |
   = note: see issue rust-lang#54727 <rust-lang#54727> for more information
   = help: add `#![feature(proc_macro_hygiene)]` to the crate attributes to enable

   Compiling proc-macro2 v1.0.3
   Compiling syn v1.0.11
error: aborting due to previous error

For more information about this error, try `rustc --explain E0658`.
error: could not compile `clippy-mini-macro-test`.
```
But propagating `--test-args` to the test suite seems to make sense regardless.
Cc @rust-lang/clippy
…as-schievink

Use `dyn` trait syntax in more comments and docs

Probably missed it out during earlier dyn refactoring.

033cbfe#diff-a0ba6bbf82d9ee83a4c9525873f85b04
Use sort_unstable_by in its own docs

Currently it uses `sort_by` instead of itself.
@RalfJung
Copy link
Member Author

@rustbot modify labels: +rollup
@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented May 24, 2020

📌 Commit 134a165 has been approved by RalfJung

@rustbot rustbot added the rollup A PR which is a rollup label May 24, 2020
@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 24, 2020
@bors
Copy link
Collaborator

bors commented May 24, 2020

⌛ Testing commit 134a165 with merge 46e85b4...

@bors
Copy link
Collaborator

bors commented May 24, 2020

☀️ Test successful - checks-azure
Approved by: RalfJung
Pushing 46e85b4 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 24, 2020
@bors bors merged commit 46e85b4 into rust-lang:master May 24, 2020
@bors bors mentioned this pull request May 24, 2020
6 tasks
@RalfJung RalfJung deleted the rollup-8yfidi8 branch May 25, 2020 07:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants